From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 25 Jun 2010 00:30:55 +0000 (-0400)
Subject: Fix after-string and image interaction bug (Bug#1336).
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~617
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2c1f71423b467437af3ee920d8b4c64ba3b3deaf;p=emacs.git

Fix after-string and image interaction bug (Bug#1336).

* xdisp.c (next_element_from_image): Ensure that after-strings are
read the next time we hit handle_stop (Bug#1336).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c72a78f076..e06d4c41363 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-25  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xdisp.c (next_element_from_image): Ensure that after-strings are
+	read the next time we hit handle_stop (Bug#1336).
+
 2010-06-23  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* lread.c (read1): Signal error if #s is not followed by paren.
diff --git a/src/xdisp.c b/src/xdisp.c
index 7dcdf19431a..73ed675c4d2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6429,6 +6429,7 @@ next_element_from_image (it)
      struct it *it;
 {
   it->what = IT_IMAGE;
+  it->ignore_overlay_strings_at_pos_p = 0;
   return 1;
 }